Slightly modifying tests