ObservableValueController patches

A previous commit (code refactoring) broke the tests for ObservableValueController. This commit fixes those issues.