Restored build
Cleaning up setUp