Updated app test structure