rebuild test to spec ported