Some changes which I had done in order to run the tests succesfully.

Signed-off-by: John May <john.wilkinsonmay@gmail.com>