#84 + tests updated