fix some names and internal APIs for cleaning
delete unused mock file
fix with seconds
implement at all (not tested!)