started fixing issues for failed test