moved tests back to 'test' package