Fix system tests for code changes