Readded a lot of tests