Expanded a test after some thought, and updated a method to include more cases.