Commented out a couple of tests