Finalised testing changes