1) Add Unit tests
2) Add Feature tests