moved test files over to subpackage