a few more passing tests, hopped around a little