Updated test file
Added a new unit test
Updated some code