added tests, 63% coverage and counting