Some updates following tests results