Removed unnecessary xml files including log4j and persistence.xml (test). Updated controllers to Spring 4 REST Controllers. Fixed a couple of issues with Test context classes. Still can't get the controller test to run successfully. There seems to be an issue with servlet 3.0 (used by spring)