More work on Repository and Tests