moving everything to test directory
all almost working