Added potential fixes to two flakey steps in problems.feature
Fixed logic