FIX: Move test out of util