re-organized test files so tests are in the same package as class under
test, for more visibility