Refactoring around keeping validity of skills, abilities. Fefactored use of activity instead of context, avoided some potential exceptions
Added quick unit tests for verification functionality of skillset and abilityset