Fix Supply.list and make code more readable
Make sure all S17 tests are run on moar