Passing tests, fixes #1