amended test structure and build script for jbehave