tests uncommented and fixed. Some tests fails.