fixing race on test and getting ready for retags