Fix base tests