some minor changes to assert