Fix for system tests via RestAPI