- made tests pass
- removed some pending tests
- slight test refactoring