Add missing columns and refactor unittests accordingly.