Add smoke tests
Remove useless line
Add more smoke tests