Tinkered with tests