GENERAL - removed todo from test classes