changed gui and tests to accompany