As disscussed, try to refactor code in ```__test__``` so addition of new applications is easier and all tests are passed.