Removed methods that test implementation detail
Removed useless test
Refactored test file
Refactored test file
Little refactory