Code clean-up, unit tests for Maven configuration, handling for duplicate Maven configuration