[#119] (Amber, Danie, Matthew) Started working on @wip cucumber test