Code Formatting
Fixed tests.
Code formatting.