Almost all tests added