Cleanup of Account table and added unit tests around the administrator account