more tests and code coverage update to 75%+