Added some tests and better naming