All tests work again

Maybe I should change cascade everywhere to none