Added spec tests for several other roles + extended tomcat tests