Refactored ability tests