Fixed some classpath issues causing unit tests to fail