cleanup
fixed tests