Remove ? from methods.
Add passing tests.