Fixes for trailing test