test cleanup
fixed tests