Finished work on tomcat tests