Fixed unit test logic more