Applications refactored and tested