Commented through the new tests