Removed unit tests that will be irrelevant soon anyway