Tests updated
Debug; new tests added