fix some basic tests