Adding Tests
Removing commented tests