Small changes
Formatting
More tests