rearrange for code coverage