#4137 Fixing system tests