Debugging additions

* Some parentheses were misplaced

* Got unit tests to run