Fixed tests for Account