Remove deprecated classes and tests. Adding more refined Spock tests which include XML examination support