Refactored tests
Reformatted tests