merge GUI test
Clean and rebuild