Complete move of _test to _unittest