Fix code/test correspondence; explicitly skip test empty cells/tests.#112