splitted a few tests
renamed tests