Updated Motor plumber tests