Pre-migration testing V1.1

Includes fixes from pre-migration testing