more removed/fixed tests