Add a few more checks for compare and swap tests