corrected test and some cosmetical stuff