Merge "Additional Unit Tests for core modules"