Refactored supplies for testing
Merge branch 'develop' into supply-tests
More tests
Finished supplies testing
Merge pull request #239 from Wizecoder/supply-tests

Finished supply testing