Fixing system tests.