+ functional tests + db fix + Resources