Changed unit test
Added new files