Added full set of assertions