added few more tests and minor changes to source