tests, minor naming fix, new todos