removed H2 from project
fixed tests and cleaend up some code