test-fun-prog removed.
Inline functions removed, conditional refactoring.