Refactored the unittest to utilise the new split libraries.
Authored by: hermsen 2021-10-23
Parent: [4fb19e]
Child: [adb74f]