work in progress
refactoring tests