Wait condition test refactor

Removed magic numbers