fixed some more tests and stuff...