Added some assertions and building out Assertion tests.