Fixed the abilities, fixed the tests