Fix styleing error that breaks the interface.
Small fixes for the linter and inclusion of the new library.
Merge remote-tracking branch 'origin/tests' into tests