Add more tests, improve test names