Put back basic tests