Added more test stuff with cucumber etc