Increase test coverage: Add tests to the core module