Merge "Migrate old wiki Junit best practices"