Simplified the tests a lot
Changed the tests so they dont rely on let and subject so much