Added more step definitions and JUnit support