Removed one test class.
Added missing tests
Merge remote-tracking branch 'origin/master'