Implemented test builder across instances
Managed to get test builders working