re-wrote some tests

These tests looked broken. I've fixed them!