Fix #1567 and add tests to cover getChildView taking a model

since getChildView is going to be called either way, should I just write an assertion for that instead?