TODO, some tests that should be added