More tests fixes