Merge "NPE fix when launching test project"