Forgot to modify test funcs