Fixed main classes not included in the test classpath
Added @since 1.6.0