adding more unit tests, issue #13