Added more functional tests