load matrix and exercise in tests
Whitespace and indentation fixes