Allow tests to actually run.
Add required library for tests.
Merge upstream master branch