adding tests; use 'Of' everywhere instead of sometimes 'By'
11 files changed