More tests finished. Many changes done in files.