Additional debug, fixed tests