First couple of assertions fixed