Add TODO to test classes
Add some documentation