remove hard coded Durabilty and reconfigure system test files