Got schema lookup tests to pass