test cleanup
prepping for merge