Getting more Account tests to pass