Tweak to basic tests