Add callback for BON features + Improve FBTests related to them