Tidy test utils
version 0.0.22