testing also with h2. Solved the found bugs.