clean up test code to make their purposes clearer
heed type assertion using ::