code formatting
Fixing tests