tweak and add tests