removed deprecated should, ref #41
Fixed broken tests, added missing tests, ref #41