Add AggregateBase and make all repository tests pass