Removing gui testing stuff so it can be merged with master