Better basic tests