Removes a few obsolete and skipped tests and fixes a previously skipped unit test