Changed repo implementation/updated tests