reverted some tests