test cleanup
address various issues based on user feedback