Readded all tests
Readded all tests