Should there be a unit test here as well?