Minor Maven Fix
Refactor of Test Configuration