get rid of unsed _reset module
cleaned up code in unit tests so that it works with more stringent module management