Fixed upgrade with timeout test. Closes #185
Fixed respond to flash policy request test. Closes #184
Merge pull request #186 from kkoopa/test_fix

Fixed tests. Closes #184 and #185