Refactored test locations
Updated pom
Updated pom, all