Still refactoring assert functions & AssertClass