fixing and updating tests