Removed reduntant stuffs coverage to 85%