Added fully functional test