Added tests for missing callbacks, need to complete checks in code