fixing merge issue as a result readding the testing file