Incorporates tests from #13 into refactor