Implemented strand, stror and icase critertions (relates to #3)
Refactored critertion tests (relates to #3)