Added better tests and removed breaking tests that weren't really testing anything anyway.