Changes for 0.5.9 test