Cleaned up some testing code.