Tests for system extensions.
Tests for argument extensions.
A bit of clean up.