ui test fixes for new when run block

Mostly just changing block numbers around