Removed unused variables, and enhanced GUI for both tests.m