Made test more test-y