Added two more tests and changed formatting style