moved todo from test class to implementation