tests power shield and introduces various cleanup changes