a large number of changes to align granite integration testing model