SLING-4138, remove type check, additional tests