Reshaped the tests again