Update tests to work properly under 2.1.1; update to 2.1.1 [fixes #117]