DATAREST-387: Write base-tests more succinctly