Added back basic feature tests