Small correction for tests, need to create out directory
more changes