Updated with some cleaned up tests in the example