Update specs to use build and before all when possible, faster now