Make existing tests work.