Reintroduce test that wasn't so redundant after all...