fix tests pt 2