Added more functional tests, README updates