Added proper tests

Removed useless ones
Modified Better ones