jonas + geromino tests updates