Shorten tests