Tests fix, New tests, Test refactoring