refactoring: try to stabilize tests