more tests; fix test plan