More test factoring, less Spring namespacing
Minor cleanup
Adding compiler arguments and removing empty types