Update unit tests
Merge branch 'patch-1' into patched