Test update and reorganization (eclipse too slow)