Couple of small changes to test layout and db settings