Changed some Repository methods to be async as well as refactored and updated some of the unit tests