Renamed sugar-tests, add underscore-typed-tests