remove old testy scripty thingy
rearrange test thingies, to be more testy