Fix for remote testing
Fix https