Move tests to their own package.
A version without tests