attempt to split test and some little changes