Cleaneup tests. Added TODO
Code review fixes. checkpoint.