Added missing error codes from Beta 3
Added a unit test on Watches