Updated commercial and sight account tests
Merge origin/master