Amended tests slightly