Refactored assert methods
Finished refactoring of methods into better names and paths