removed leftovers code
fixed tests