Working on sorting out why the ability functional tests arent working
Tried to fix testing again
Fixed merge conflict