Added more functional tests
Fixed typos