fixed more tests
yabu - yet another bootstrap update
all green again (except a few cukes)