pelrtidy
refactoring tests +code cleanups