Improve tests

Switch from ok() to equal() to allow for better testing. Version bump
to 2.1.1.