Updated for #45, although the tests no longer test the right thing - instead of looking for a -1, they should look for a 0 and a warning