Minor changes; add tests
Automate tests (make check)