Add accidently uncommited changes to tests and a TODO file