Fixed base tests and other bugs