Cleanup and added another cucumber test