some tests renamed
whitespace fixes