Add tests for on demand/live state of Supply