Move updater mock into test class namespace
Pull mock initialization code into initialize