Bump bb 1.0.58 and fix project tests