Add more trivial tests