working on some refactoring of tests