Remove extraneous append & fix tests