Added more tests
Added more WebAPI tests