bumped version to 1.5.8.1.
updated tests to reflect recent changes.