Update the tests - Fix #137. Check the previous commits to see the code for the actual fix.