More corrections. Now everything is ready for real tests
8 files changed