Moved Tests to a separate directory so that coverage can run