start of upgrade to integrated test