Modify old tests, add new ones