unittests: Expand unittest coverage