Move specs and add one helper