Refactor and Assert methods...