Fix compile error caused by merge error.
Updated validation + tests to cover one an overlooked case.
Merge branch 'develop' into feature/angular-ui