Cleaned up tests and formatting.