Maybe this method should be in a separate test?