debugging
fixed tests