Stopped infinite loop of Supermarket
Tidied up TestShelf