Removed some tests that are not applicable anymore