adding more tests and improving coverage
merging after changes in log01