changed some checks, commented out tests of no interest