add headers and fix test