Restructure and clean up lookup tests.
Create ModelTest and move relevant tests into it.