H2 :  Moving some tests to H2 thus avoiding the need to have a postgresql server running
H2 :  Fix merge conflicts
H2 :  Fix an execution issue coming from the merge conflict resolution