Remove old stuff
Consolidate repeated tests