Feature/master/add classpath and test utils