add missing uses for base.php
splitup tests