Added tests

Removed unused code