Fix tests code smells - less assertions per test