Change assertions to have expected value first