All basic tests working again