David Bernadett -- add more to Tier III Test , made some stuff private