Fix for unit test issue encountered from Gradle (IntelliJ was fine). Might need additional tweaks.