Modified library
Added test scripts