Add more testing

For GUI