Updates to better allow for testing.