Added more complex functional tests and refactored tests DB
Fix tests DB dump
Trying to make test pass
This is a test
Try to pass tests
Merging with remote