Unit tests for the change in Pull #88.
remove a few checkstyle warnings