added missing files
added test changes
Merge remote-tracking branch 'origin/master'