Cleaned up Account tests