[ADD] Tests but commented because of bug in progress