Closes #2 and closes #3, correcting numbers in test

Unclear how these test could ever have passed. No code changes after tests were written, therefore correcting the test, not the code.

Also contains drive-by typo fix.