more tests, working diff w/out weird spacing bug