test added to classpath, some minor modifications