Fixed few TODOs.
Removed apache-tuples -- added fj.P ; fixed  unit tests.