modified tests. further developed gui