[TASK] Fixed failing unit test and added failing functional test