Added stuff and fixed tests (discovered accidental override of unittest.py with 2001 version... Oops)