Refactored and cleaned up tests
Refactored and cleaned up tests

rtucker-mozilla/mozpackager,rtucker-mozilla/mozpackager,rtucker-mozilla/mozpackager,rtucker-mozilla/mozpackager,rtucker-mozilla/mozpackager,rtucker-mozilla/mozpackager