Minor changes to Logic Test.
Remove code with warning.
Refactoring.