Add test goal back in