Fixed tests to comply with new outputs