Trying to fix systests. Added more debugging