Remove reliance on @Repeatable, add fixtures for @OneOf