Added new functional test