Fixed remaining unit tests