Cleaned Up Testing Code