added another test and few tiny changes around the files