debugger now works
improved tests