Expand put tests; fix headers