Major updates, deletions and tests