Added todo
Refactored feature tests