Fixed some 'invalidly' valid tests. Abandoned 'Matchers'.