Damned tilde backups
Started updating tests