Fixing tests and "require_once" for new files.