Relocated test utils
Fixing up old code