Reworked Tests, added groups, introduced Repository