Updated Basic tests