Moved Tests into a package