started to resolve test issues
resolved issues with tests