minor tweaks + more tests (fixes #2)