Test fixes for .run