test fixes: halfway done