Removing a few failing unit tests