Passing tests

This should allow tests to pass for the time being.