code quality fixes
file rename
integration tests support (h2 database)
fixes