added keyword option, moved tests around; no actual tests yet