Fixes for expanders test