Refactored test locations
Updated pom