Passing tests, closing #1