some reformatting
Updating tests