Fix unit tests for new expanded_20141117 test DB