Remove TODO that has been taken care of
Add test in declaration