uncommented some tests