Added base file extends, more unittests