getting rid of sleep
Merge remote-tracking branch 'origin/feature/bindle_test_framework' into feature/bindle_test_framework