Delete old file
Added some unit tests