starting on real tests, various fixes