Tests and code clean
Removed unused tests