Removed TODO for now
Refactored test support to follow the pattern