Adding more tests, cleaning up current one

FUCKIN 67 tests OMFG.