Make type class tests work again