Additional unit tests for extracted functions