refactored Assertions a bit more