final shema with all the tests works now