Fix specs tests.  Still need to fix remaining integration tests and figure out maven-metadata.xml test.