Made test asserts more logical