Change tests to use guinness