More and nicer tests.