Working on failing unit tests