Updates test class organization to match Neatline reorganization.