Cleaned up testing code.
Clean up testing code.