Created more functional tests