Commented some tests away