Add extra nesting as web expected by test server setup
Configure test database