Removed TODO and added tests based on it