fixes to system tests