Fix tests with 2.1. Tests 100% working.
CS fixes to test.