Small test utils enhancements