Pre-migration testing 1.1

Minor changes