Added capabilities and more tests.