Refactor tests for issue #3