Update gitignore.
Renamed models to avoid name clashes.
Updated tests with a better database test.