Fixed some issues with tests failing from postalcode merge