Changed around how assertions are called