Fixes in app test