Fixed tests, restoring database
Merge branch 'master' of https://github.com/jriquelme/yarquen.git