Created more specific DB tests, changed DB structure