Fixed H2 to return data similar to NoSQL solution, this fixed some broken tests