Refactor tests: missed some tests and files out of previous commit.