Additional test case, refactor tests.