Updated testing framework, and added functioinality around parsing.
Merge branch 'master' of https://github.com/codecore/Functional