Add acceptance and functional tests