Adding more functional tests