new tests + db adaption