Commented some tests. Need to rework