Shorten tests
internal api rewrite