fixed a few more tests + clean up