Tests moved to 0.4 and 0.5 respectively