Make some spoof tests more constrained
remove unnecessary lines