remove TODO comment
bugfix, more tests