fix tests failing
suggestions added