Catering for empty DB on test server
Empty DB on CI server - adjusting