Minor tests edits