So @seandst are you proposing waiting on merging until #616 is in and the consolidating the tests into a crud test?