Add couple of failing unit tests to be handled