Minor improvements
Added draft  test cases
Merge remote-tracking branch 'origin/master'