Fixed tests to correspond to new format