added 20 or so tests to improve test coverage