fixed more remarks and split testfiles