Updates tests to respect new Neatline class nomenclature.