Track 0.4 changes, modernize testing