De-coupling makes testing a bit easier.