POM Cleanup and Test Fixes