Refactored maven test shit