Refactor to ensure that tests for not-yet-implemented features won't block builds