More tests and improved results saving