Implemented zero/one-or-more and minimal test coverage