Revert "BREAK TESTS FOR DEMO"

This reverts commit 262c32c6900d119dc08432b6b057a412b915c37d.