Refactor test; add more tests.