Add tests classes
Add tests packages
Simplified dumb tests then