updated tests file + some small changes