Fixed unit tests and added test for issue #10.