Added real test
Added real test
Merge remote-tracking branch 'origin/master'