Solved small issues that didn'tallow tests to be passed