Maven Restructure, Fixes, Junit Tests