Tweak some use order.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixes testcase namespace.

Signed-off-by: crynobone <crynobone@gmail.com>
Move to PSR-4.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'