Tests refactor
Merge pull request #234 from keyvanakbary/tests-refactor

Tests refactor