Make Tests pass