builder deleted, test names corrected