First attempt at a proper test.
Consolidated testing, now passing.
Merge branch 'proper'