reformatting
Adding tests