Stabalise the test and add another test.
Fix conflict