Added some tests for pre-database swap.