prelaunch test improvements