fix issues with system tests