Refactor Account and accompanying tests

Complies with #33.
All tests pass