Test app tweaks