fixing functional tests and build,, also added datamigration for ea <-> location in investigator model