Changed some code up for use with autotest and Growl