Attempt to fix classpath issue so that tests and code work both with pure maven, jenkins and in production