Fixing changes

fixed recommended changes
added to tests