Issue #25 Reorganized tests.