polished existing tests and started work on some new ones