Uncommented some tests