Test fixes
Merge pull request #343 from mhaskel/test_fixes

Test fixes
Sometimes killing apt is too aggressive.
Merge pull request #344 from mhaskel/test_fixes

Sometimes killing apt is too aggressive.