Add tests
Add more functions and specs