Added issue to TODO included some minor changes
Improved and refactored all test hooks and helper methods
Added tests for challenge functionality