Added new tests
Fixed test names
added name to project mock
Merge remote-tracking branch 'origin/master'