Test GUI improved a lot. Cleaning.