Fix up tests state in preparation for adding album model