Try fixing tests and debug