Update unit tests and removed test case that doesn’t apply anymore