merging in more tests'