rmeoved consistency check for now, fixed tests