cleanup
switch order of asser statements