refactoring towards application tests