Commented out tests which wasn't a smart move