bumped version to 1.2.6.1; updated tests to reflect recent changes.