Improved tests and converted all to before do, with described_class let