Flexitests: various fix