Fix bug
Reformat tests
Save changes