Fix additional tests