Yes, keeping functional tests separate sounds good to me.