Fixed all tests, and code. Tomcat issue still persists.