Tests uncommented and fixed.