fixed account-tests; cleanups; bugfixes