Commented out some dependencies in pom.xml that were messing things up and implemented missing things for commented tests (and a proper cleanup).