fix unit tests, fix raise Todo