make a few tweaks for consistency /issue #11
fix test cases (bad example on my part) /issue #11