Add check binding and tests. Update disable / enable binding and tests.