Formatting
Adding tests