Updated func tests