Fixed some failing unit test. Missing test for new func.