Fixed Changes for Test app