#40 Forms removed from AccountService. Part of the unit tests improved.