A few more tests and add TODO description