Bump obb-rules
Prepare stash
Fix tests