Make test suit pass