Adding testing infrastructure... Analysis forthcoming...
Fixing issues with testing.