Fix a bunch of bokken tests