* updated some tests, and fixed some bugs
* tests are a Good Thing(tm)