Move tests out of subpackage