Fix up the tests
Fix up the tests

jlucansky/refit,paulcbetts/refit,onovotny/refit,mteper/refit,PureWeen/refit,martijn00/refit,PKRoma/refit,jlucansky/refit,onovotny/refit,martijn00/refit,PureWeen/refit,ammachado/refit,paulcbetts/refit,ammachado/refit,mteper/refit