ofType: Improve unit tests.