Add more tests and modify existing ones.