Some edits for tests