cleaned app and tests