Removes redundant and/or broken tests
Major rework of build process
Big and ugly merge