JBTM-715

Test has same package structure as class it is testing because most
methods are package scope.
JBTM-715