Added more lookup values. Modified tests.