This still needs test coverage – specs for the specs!