more stuff and tests