clean up tests
add cucumber support