improved test
removed some todos
more func test