GUI in progress, tests expanded