removed imits related tests, modified ilar codes