added some functional tests
added some functional tests