Add debug info and new test