Added web api unit test.
Merge branch 'master' into develop