Fix for remote testing