Updated basic tests