Fix all existing tests to pass