merge some more tests in.