New tests added. Fix for issue #5.