All tests converted to unittest