Debug; new tests added