tests, more testable code