Moved tests into proper folders, fixed pom and update main for ticket.
Tests are now in the proper package name, deleted an extra line found in the pom file and fixed an issue with the main method