fixed a few tests and what not