Fixed the errors with the assertions.
Fixed some incorrect methods being called.

Signed-off-by: Andrew McDonald <mcdonalda1993@gmail.com>