removed 'TODO: unit tests', unit tests are done