Progressing in cleanup and test