Converted some more unit tests to Spock tests, ones that will be more readable or succinct in Spock.  Some of the tests have had more test cases added to them.  Deleted JUnit tests that have spock tests.