Applied selected changes made by @tkrisztin in b9931e5, a33ab4c and d4540cf0 to algorithms.

All unit tests pass again. Deactivated acceptance tests for the time being.
Increased life expectancy calculation max age to 120 years and updated various unit tests.