Fixing and adding some tests
Prepearing for 1.4.1 release