Reverting some stuff

just more tests and stuff