Updated readme
Updated functional tests and test runner