Finished moving all tests to unittest framework\!\!