unit tests fixes from layout changes