Make all but one of the implemented tests pass again

Still need to figure out what's wrong with that last one.