Add more tests and handle them.