more tests

and stuff