I think these belong under test as well