restructured test dir
whitespace fixes