Fix a bug and REALLY test the capabilities