adjusting/cleanup tests