Updated to work with unittest 0.11.0 (Closes #1)