More broken tests, rebuilt bake.sh, thinking about ways to optimize in general.