bug fix
fixed tests, running and passing