Fixed the problems that were causing several tests to fail. We are now green and very HAPPY :)