Fixed tests when run via sauce. Remove debug code