migrated fixes back to tests branch