Add more tests (complete)