Fixed tests so they can all run together.