a lot of tests added