Added 2 fail unit tests, bug fix