Fix broken unit test

* Fix unit test due to changes in e4f6e0df
* Fix minor lint complaints + typo