Update tests to match master Commit
413751c4b40401ba3179ac21b834db908b15931c