machine rebuild + test updates + cleanup