adding test - Fixed #148 Fixed #87 Fixed #79