more tests, flushed out a bug