Copy changes to BuildFileTest across into new rule