moving some tests to individual packages to clean up the structure