[Updated] Clean + Prepare
[Added] App tests coverage