Removed invalid tests (caused by merge issues)