Moved tests into their own package