Renamed sugar-tests, added underscore-typed-tests