Adding a few more functional tests