Issue #11. Reorganized the test project a bit.