Tests fixed - Design reviewed