Properly enable buttons.
Fix wrong overrides and add more tests.