Merge pull request #659 from hhovsepy/master

added more hammer tests
added more compute resource CRUD tests
Merge remote-tracking branch 'upstream/master'