Fix problem with failing system tests