Plan: Properly cleanup when removing accounts, expand unit testing
This would eventually result in crashes.