some refactor in test classes