Cleaned up some javadoc
Spockified some more UTs