#29: passed unit test
#129: simplified the unit test
closes#129