Test fixes (incomplete)
Moved test_base to tests folder