rewritten some more tests