updates to gui, added test switch functionality