Add fixtures and fix to use database