fixed tests (before they were :shit:)
:yum: more tests