Refactored knowledge tests