Writing tests for 1.05
Merge tag '1.05' into final
1.05